Add service tab in settings use SwiftUI #311

phlpsong · 2024-01-07T02:47:32Z

Summary

#288 Add a new service tab using SwiftUI

Screenshots and videos:

Screen.Recording.2024-01-07.at.10.33.17.mov

Appreciate it if you could have a look at this PR and comments are welcomed.

phlpsong · 2024-01-07T03:02:57Z

Forget to mention, that I did not find a similar icon for the tab in SF Symbols.

If you find a better one, please let me know.

tisfeng · 2024-01-07T03:32:25Z

我试了一下，看起来不错。briefcase 这图标没问题。

发现开启服务会导致崩溃

-[__SwiftValue integerValue]: unrecognized selector sent to instance 0x6000035ac420
(
	0   CoreFoundation                      0x000000018fa76800 __exceptionPreprocess + 176
	1   libobjc.A.dylib                     0x000000018f56deb4 objc_exception_throw + 60
	2   CoreFoundation                      0x000000018fb283bc -[NSObject(NSObject) __retain_OA] + 0
	3   CoreFoundation                      0x000000018f9e0a84 ___forwarding___ + 1572
	4   CoreFoundation                      0x000000018f9e03a0 _CF_forwarding_prep_0 + 96
	5   Easydict-debug                      0x00000001049fc22c -[EZBaseQueryViewController handleServiceUpdate:] + 104
	6   CoreFoundation                      0x000000018f9f6820 __CFNOTIFICATIONCENTER_IS_CALLING_OUT_TO_AN_OBSERVER__ + 148
	7   CoreFoundation                      0x000000018fa8a8ec ___CFXRegistrationPost_block_invoke + 88
	8   CoreFoundation                      0x000000018fa8a834 _CFXRegistrationPost + 440
	9   CoreFoundation                      0x000000018f9c548c _CFXNotificationPost + 764
	10  Easydict-debug                      0x0000000104a91e10 $s8Easydict10ServiceTabV010postUpdateB12NotificationyyF + 964
	11  Easydict-debug                      0x0000000104a90710 $s8Easydict10ServiceTabV14serviceToggled5index8isEnableySi_SbtF + 748
	12  Easydict-debug                      0x0000000104a90414 $s8Easydict10ServiceTabV11serviceListQrvg7SwiftUI18DynamicViewContentPAEE6onMove7performQry10Foundation8IndexSetV_SitcSg_tFQOyAE7ForEachVySaySi6offset_So13EZServiceTypea7elementtGSiAA0b4ItemI0VG_Qo_yXEfU_AVSi_ARtcfU_ySbcfU_ + 72
	13  Easydict-debug                      0x0000000104a7b044 $s8Easydict15ServiceItemViewV4bodyQrvg7SwiftUI05TupleD0VyAE0D0PAEE5frame8minWidth05idealK003maxK00J6Height0lN00mN09alignmentQr12CoreGraphics7CGFloatVSg_A5uE9AlignmentVtFQOyAE5ImageV_Qo__AE4TextVAiEE11toggleStyleyQrqd__AE06ToggleW0Rd__lFQOyAE0X0VyAE05EmptyD0VG_AE06SwitchxW0VQo_tGyXEfU_ySbcfU_ + 92
	14  Easydict-debug                      0x0000000104aa9460 $s7SwiftUI7BindingV8EasydictE6didSet7executeACyxGyxc_tFyxcfU0_ + 316
	15  SwiftUI                             0x00000001bbaedaac OUTLINED_FUNCTION_24 + 3972
	16  SwiftUI                             0x00000001bb18bda8 OUTLINED_FUNCTION_0 + 7992
	17  SwiftUI                             0x00000001bb18a358 OUTLINED_FUNCTION_0 + 1256
	18  SwiftUI                             0x00000001bac17f20 OUTLINED_FUNCTION_13 + 4184
	19  SwiftUI                             0x00000001ba38d754 objectdestroyTm + 272
	20  SwiftUI                             0x00000001bb18bda8 OUTLINED_FUNCTION_0 + 7992
	21  SwiftUI                             0x00000001bb18a358 OUTLINED_FUNCTION_0 + 1256
	22  SwiftUI                             0x00000001bbaef6d8 objectdestroy.2Tm + 3400
	23  SwiftUI                             0x00000001bb18a358 OUTLINED_FUNCTION_0 + 1256
	24  SwiftUI                             0x00000001bbaef6d8 objectdestroy.2Tm + 3400
	25  SwiftUI                             0x00000001bb18a358 OUTLINED_FUNCTION_0 + 1256
	26  SwiftUI                             0x00000001bb18b788 OUTLINED_FUNCTION_0 + 6424
	27  SwiftUI                             0x00000001bb18bb30 OUTLINED_FUNCTION_0 + 7360
	28  SwiftUI                             0x00000001bb18a358 OUTLINED_FUNCTION_0 + 1256
	29  SwiftUI                             0x00000001bbaef6d8 objectdestroy.2Tm + 3400
	30  SwiftUI                             0x00000001bb18a358 OUTLINED_FUNCTION_0 + 1256
	31  SwiftUI                             0x00000001bbc8b5ac OUTLINED_FUNCTION_9 + 4024
	32  SwiftUI                             0x00000001bbc8b3f0 OUTLINED_FUNCTION_9 + 3580
	33  SwiftUI                             0x00000001bbc8b614 OUTLINED_FUNCTION_9 + 4128
	34  AppKit                              0x0000000193380464 -[NSApplication(NSResponder) sendAction:to:from:] + 460
	35  AppKit                              0x0000000193380268 -[NSControl sendAction:to:] + 72
	36  AppKit                              0x000000019337d4f0 NSControlTrackMouse + 1168
	37  AppKit                              0x000000019337c54c -[NSControl mouseDown:] + 844
	38  AppKit                              0x000000019337b18c -[NSWindow(NSEventRouting) _handleMouseDownEvent:isDelayedEvent:] + 3472
	39  AppKit                              0x0000000193306690 -[NSWindow(NSEventRouting) _reallySendEvent:isDelayedEvent:] + 364
	40  AppKit                              0x0000000193306350 -[NSWindow(NSEventRouting) sendEvent:] + 284
	41  AppKit                              0x00000001939aff30 -[NSApplication(NSEventRouting) sendEvent:] + 1604
	42  AppKit                              0x0000000193602110 -[NSApplication _handleEvent:] + 60
	43  AppKit                              0x00000001931ce124 -[NSApplication run] + 512
	44  AppKit                              0x00000001931a53cc NSApplicationMain + 880
	45  SwiftUI                             0x00000001ba30cf80 OUTLINED_FUNCTION_12 + 15824
	46  SwiftUI                             0x00000001bab9d30c OUTLINED_FUNCTION_3 + 196
	47  SwiftUI                             0x00000001bafe34f0 OUTLINED_FUNCTION_1 + 152
	48  Easydict-debug                      0x0000000104a7f1f4 $s8Easydict0A17CmpatibilityEntryO4mainyyFZ + 100
	49  Easydict-debug                      0x0000000104a7f304 $s8Easydict0A17CmpatibilityEntryO5$mainyyFZ + 12
	50  Easydict-debug                      0x0000000104a813c0 main + 12
	51  dyld                                0x000000018f5a90e0 start + 2360
)

phlpsong · 2024-01-07T03:38:00Z

OK, will take a look later

tisfeng · 2024-01-07T03:42:00Z

整体没什么问题，有些细节还需要改进：

设置页服务这里拖动修改服务顺序，应该发一个通知，更新查询窗口的服务顺序。
图标和 Toggle 有点显大了。
服务页窗口的宽度是否可以调整？相比之前，目前看起来有点宽。后面应该会在右侧添加服务的 api key 设置选项，到时候需要宽一点。

重写设置页时，功能和 UI 尽量和之前保持一致。

tisfeng · 2024-01-07T04:27:07Z

看了一下代码，有通知 postUpdateServiceNotification，是 onServiceItemMove 逻辑有问题。

phlpsong · 2024-01-07T05:24:23Z

Sorry, accidentally closed this.

1. 设置页服务这里拖动修改服务顺序，应该发一个通知，更新查询窗口的服务顺序。

Yes, something is wrong with the order check logic, fixed in the latest commit.

2. 图标和 Toggle 有点显大了。

Updated, please check.

服务页窗口的宽度是否可以调整？相比之前，目前看起来有点宽。后面应该会在右侧添加服务的 api key 设置选项，到时候需要宽一点。

Need further check

I can't reproduce the crash issue, but it may be caused by the userInfo value, which should fixed in the latest commit.

tisfeng · 2024-01-07T08:25:40Z

现在跑起来没问题了。

@Kyle-Ye 帮忙 review 一下代码。

phlpsong · 2024-01-07T09:14:07Z

@tisfeng I have changed the frame size of the service tab to 360*540, which will look like the below:

Please let me know your thoughts.

Easydict/App/Localizable.xcstrings

tisfeng · 2024-01-07T09:31:14Z

修改后的窗口大小没问题，这个可以添加动画吗，不然切换 tab 时看起来好突兀 🤔

tisfeng · 2024-01-07T09:34:09Z

这里需要去掉分割线，添加一下选中效果，高度也需要增加一下。

phlpsong · 2024-01-07T14:00:50Z

Official support for separator and highlight behavior is available from macOS 13. Need some time to find a solution for this.

tisfeng · 2024-01-07T14:17:46Z

Official support for separator and highlight behavior is available from macOS 13. Need some time to find a solution for this.

问题不大，目前新的设置页和菜单都是 macOS 13+。

但是有个问题，目前应用是支持 macOS 11+，如果用户系统是 macOS 12，那会使用旧的设置页吗，我没看到相关的兼容代码。

Easydict/Easydict/NewApp/View/SettingView/SettingView.swift

Line 12 in 261b625

struct SettingView: View {

phlpsong · 2024-01-07T14:30:35Z

OK, I get it.

No, I didn't find such logic. Maybe I could add this logic in EasydictCmpatibilityEntry.

like below


if NewAppManager.shared.enable && isOS13Above {
       EasydictApp.main()
 } else {
       _ = NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv)
 }

Kyle-Ye · 2024-01-08T02:46:09Z

OK, I get it.

No, I didn't find such logic. Maybe I could add this logic in EasydictCmpatibilityEntry.

like below
if NewAppManager.shared.enable && isOS13Above {
       EasydictApp.main()
 } else {
       _ = NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv)
 }

-1 on this.

This is 2 separate thing.

One is AppKit lifecycle(entry point) vs SwiftUI lifecycle(entry point)
One is original AppKit Settings and new SwiftUI Settings.

IMO, we will certainly migrate from the old lifecycle to the new one once we are already since App is available on macOS 11+. However we may still use the old AppKit/ObjectiveC based Settings on older OS.

We need a NSViewControllerRepresentable to wrap the old Settings VC as the corresponding SwiftUI.Settings in SwiftUI.

This may not work and have some bug, if so we may consider just drop macOS 13- support.

tisfeng · 2024-01-08T12:20:52Z

We need a NSViewControllerRepresentable to wrap the old Settings VC as the corresponding SwiftUI.Settings in SwiftUI.

I don't know much about this, you guys may need to follow up and deal with it later.

This may not work and have some bug, if so we may consider just drop macOS 13- support.

Try to see if macOS 13- can be supported first, and if that's not possible, upgrading to macOS 13+ is acceptable.

Kyle-Ye · 2024-01-08T14:18:33Z

@tisfeng Since I could not reproduce the crash issue, could you kindly help to test it on your device?

About the cell highlight changes, onTapGesture will make the onMove modifier not work which affects the drag/drop feature. Could you confirm the default behavior(use accent color) is acceptable?

onTapGesture and onMove can exist together if you code properly.
Why we need custom select logic here? The default toggle click action and a future feature of right click to edit is enough.

phlpsong · 2024-01-08T14:30:20Z

@tisfeng Since I could not reproduce the crash issue, could you kindly help to test it on your device?
About the cell highlight changes, onTapGesture will make the onMove modifier not work which affects the drag/drop feature. Could you confirm the default behavior(use accent color) is acceptable?
1. `onTapGesture` and `onMove` can exist together if you code properly.

Same issue in https://stackoverflow.com/a/64194868, but the accepted answer not working.

2. Why we need custom select logic here? The default toggle click action and a future feature of right click to edit is enough.

This is to customize the highlight color of cell selection and try to keep the same behavior as the AppKit version.

.listRowBackground(selectedIndex == index ? Color("service_cell_highlight") : Color.clear)

I think the default behavior is acceptable.

…psong/Easydict into phlpsong/service_tab_swiftui

tisfeng · 2024-01-08T15:30:46Z

In addition to adding the click highlight background color that makes it impossible to drag the cell, another issue is that the highlight index should only work for the current window type, e.g. mini, and the selection effect should disappear when switching to a fixed window.

…psong/Easydict into phlpsong/service_tab_swiftui

phlpsong · 2024-01-08T15:46:33Z

In addition to adding the click highlight background color that makes it impossible to drag the cell, another issue is that the highlight index should only work for the current window type, e.g. mini, and the selection effect should disappear when switching to a fixed window.

Fixed in e72ef0d. Also correct the behaviors after drag&drop and toggle action.

tisfeng · 2024-01-08T16:30:53Z

Good, these two bugs are both fixed.

Easydict/NewApp/View/SettingView/Tabs/ServiceTab.swift

tisfeng · 2024-01-13T11:45:45Z

I tried the latest code and it looks like the problem is solved, is there anything else to add to this PR? @phlpsong

phlpsong · 2024-01-13T12:17:49Z

I tried the latest code and it looks like the problem is solved, is there anything else to add to this PR? @phlpsong

Yes, animation and selection issues have been fixed.

No more commits from my side.

tisfeng · 2024-01-13T12:20:20Z

ok

phlpsong added 3 commits January 6, 2024 23:36

feat: add service tab screen use SwiftUI

f04e659

feat: add service list move function

f5b6bb1

fix: Removed a file change

7ae9c0a

fix: service list order issue and UI change

f0e7b11

phlpsong closed this Jan 7, 2024

phlpsong force-pushed the phlpsong/service_tab_swiftui branch from 16c94fc to c26d506 Compare January 7, 2024 05:03

phlpsong reopened this Jan 7, 2024

style: format code

238f524

tisfeng requested a review from Kyle-Ye January 7, 2024 08:25

phlpsong added 2 commits January 7, 2024 17:10

fix: change service tab frame size

cac1639

Merge branch 'dev' into phlpsong/service_tab_swiftui

505f440

phlpsong commented Jan 7, 2024

View reviewed changes

Easydict/App/Localizable.xcstrings Show resolved Hide resolved

phlpsong and others added 2 commits January 8, 2024 14:22

feat: update the style of service list

2efd70d

Merge branch 'dev' into phlpsong/service_tab_swiftui

c3ba762

style: auto update Localizable.xcstrings

c9d2d78

tisfeng and others added 4 commits January 8, 2024 22:56

fix: serviceTypes count is greater than services count, cause crash

ea8c9e0

Merge branch 'phlpsong/service_tab_swiftui' of https://github.com/phl…

15a6372

…psong/Easydict into phlpsong/service_tab_swiftui

perf: adjust service rowHeight to 30

2e60d33

perf: hide scrollIndicators

a5e957f

phlpsong added 2 commits January 8, 2024 23:39

Merge branch 'phlpsong/service_tab_swiftui' of https://github.com/phl…

b0e0c75

…psong/Easydict into phlpsong/service_tab_swiftui

fix: reset service list selection

e72ef0d

tisfeng requested changes Jan 8, 2024

View reviewed changes

Easydict/NewApp/View/SettingView/Tabs/ServiceTab.swift Outdated Show resolved Hide resolved

tisfeng requested a review from Kyle-Ye January 8, 2024 16:51

phlpsong added 3 commits January 9, 2024 13:57

feat: optimize tab selection window transition

afbe775

fix: window frame not reset issue

50770c8

fix: onTap conflict with onMove in service tab

b05f2ba

tisfeng requested review from AkaShark, NeverAgain11 and CanglongCl January 14, 2024 01:03

tisfeng mentioned this pull request Jan 14, 2024

【Swift 重构】使用 SwiftUI 实现翻译服务 API key 可视化配置 #324

Closed

phlpsong added 2 commits January 14, 2024 17:30

Merge branch 'dev' into phlpsong/service_tab_swiftui

4b61669

fix: remove tap event print

53c393d

tisfeng approved these changes Jan 14, 2024

View reviewed changes

CanglongCl approved these changes Jan 14, 2024

View reviewed changes

tisfeng merged commit baca1fd into tisfeng:dev Jan 14, 2024
5 checks passed

Jerry23011 mentioned this pull request Jan 20, 2024

【UI/UX】Design Issues Tracker for Swift/SwiftUI migration #344

Closed

9 tasks

phlpsong deleted the phlpsong/service_tab_swiftui branch January 22, 2024 03:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add service tab in settings use SwiftUI #311

Add service tab in settings use SwiftUI #311

phlpsong commented Jan 7, 2024

phlpsong commented Jan 7, 2024

tisfeng commented Jan 7, 2024

phlpsong commented Jan 7, 2024

tisfeng commented Jan 7, 2024

tisfeng commented Jan 7, 2024

phlpsong commented Jan 7, 2024

tisfeng commented Jan 7, 2024

phlpsong commented Jan 7, 2024 •

edited

Loading

tisfeng commented Jan 7, 2024

tisfeng commented Jan 7, 2024 •

edited

Loading

phlpsong commented Jan 7, 2024

tisfeng commented Jan 7, 2024

phlpsong commented Jan 7, 2024

Kyle-Ye commented Jan 8, 2024 •

edited

Loading

tisfeng commented Jan 8, 2024

Kyle-Ye commented Jan 8, 2024

phlpsong commented Jan 8, 2024

tisfeng commented Jan 8, 2024

phlpsong commented Jan 8, 2024

tisfeng commented Jan 8, 2024

tisfeng commented Jan 13, 2024

phlpsong commented Jan 13, 2024

tisfeng commented Jan 13, 2024

Add service tab in settings use SwiftUI #311

Add service tab in settings use SwiftUI #311

Conversation

phlpsong commented Jan 7, 2024

Summary

Screenshots and videos:

phlpsong commented Jan 7, 2024

tisfeng commented Jan 7, 2024

phlpsong commented Jan 7, 2024

tisfeng commented Jan 7, 2024

tisfeng commented Jan 7, 2024

phlpsong commented Jan 7, 2024

tisfeng commented Jan 7, 2024

phlpsong commented Jan 7, 2024 • edited Loading

tisfeng commented Jan 7, 2024

tisfeng commented Jan 7, 2024 • edited Loading

phlpsong commented Jan 7, 2024

tisfeng commented Jan 7, 2024

phlpsong commented Jan 7, 2024

Kyle-Ye commented Jan 8, 2024 • edited Loading

tisfeng commented Jan 8, 2024

Kyle-Ye commented Jan 8, 2024

phlpsong commented Jan 8, 2024

tisfeng commented Jan 8, 2024

phlpsong commented Jan 8, 2024

tisfeng commented Jan 8, 2024

tisfeng commented Jan 13, 2024

phlpsong commented Jan 13, 2024

tisfeng commented Jan 13, 2024

phlpsong commented Jan 7, 2024 •

edited

Loading

tisfeng commented Jan 7, 2024 •

edited

Loading

Kyle-Ye commented Jan 8, 2024 •

edited

Loading